Autogenerated HTML docs for v1.7.7-213-g8b0e1
diff --git a/git-mergetool.html b/git-mergetool.html index 24e0488..56a6513 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -592,9 +592,10 @@ <div class="paragraph"><p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve merge conflicts. It is typically run after <em>git merge</em>.</p></div> <div class="paragraph"><p>If one or more <file> parameters are given, the merge tool program will -be run to resolve differences on each file. If no <file> names are -specified, <em>git mergetool</em> will run the merge tool program on every file -with merge conflicts.</p></div> +be run to resolve differences on each file (skipping those without +conflicts). Specifying a directory will include all unresolved files in +that path. If no <file> names are specified, <em>git mergetool</em> will run +the merge tool program on every file with merge conflicts.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> @@ -682,7 +683,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-09-21 23:01:14 PDT +Last updated 2011-10-10 16:42:04 PDT </div> </div> </body>
